Merge "Revert "Remove AHardwareBuffer_ API from libandroid""