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

Change-Id: Ic82a3c73e6de95c5f4dfc53a0cb530e499e2a377