Merge "Include vndk/hardware_buffer.h for AHardwareBuffer_getNativeHandle" into oc-dev