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