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

Change-Id: Ifdb5bd9d03afe41041f9fd1593ecc1b1748a956b