Merge "msm-camera: replace unsecure API" into msm-3.0