Merge "libcameraservice: update for revised HIDL gralloc" into oc-dev