Merge "Adding AHardwareBuffer lockAndGetInfo to libandroid"