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

Change-Id: Iaa3a3346ad1650cf89db0aa89249319f2f5cbf52