Merge "Match AHardwareBuffer format name change" into oc-dev am: 6c9b0253d1
am: 77252e9772

Change-Id: If1d868b2c2ce09ce556d9f4d1cd5a59e7f9737c0