Merge "Use libnativewindow's AHardwareBuffer directly"