Merge "Move CameraParameters class to android.hardware.camera.common@1.0-helper" into oc-dr1-dev