Merge "Match AHardwareBuffer format name change" into oc-dev am: 489edb395b
am: 89d3d2ae01

Change-Id: I5f3da6a9e9b3bbe621e433947754d79a0e6a3691