Merge "Remove AHardwareBuffer_ API from libandroid"