Merge "Match AHardwareBuffer format name change" into oc-dev