Merge "android.hardware.camera.common@1.0-helper: vendor" into oc-dev