Merge "Fix AHardwareBuffer 10:10:10:2 format" into oc-dev am: ec37174133
am: d0b2562f71

Change-Id: I85624ec5e875f366c10681d8c60946de449179b7