Merge "allocate2 -> allocateWithOptions" into main

Author: Treehugger Robot

libs/nativewindow/include/vndk/hardware_buffer.h

@@ -107,7 +107,7 @@ enum {
 };
 
 /**
- * Additional options for AHardwareBuffer_allocate2. These correspond to
+ * Additional options for AHardwareBuffer_allocateWithOptions. These correspond to
  * android.hardware.graphics.common.ExtendableType
  */
 typedef struct {