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

Change-Id: Ib258e8485a3bcafef4ec65f4b28caaaeb081189e