Merge "Make the AHardwareBuffer extension compatible with C."