Merge "Revert "Camera: Map between bufferqueue gralloc0 usage, and HIDL gralloc1 usages"" into oc-dev
am: 75160fb493

Change-Id: I5f8faa0aaaed05136a645a3315f884788e39d8af