Merge "camera: Map between legacy gralloc0 usage, and HIDL gralloc1 usages" into oc-dev