Merge "msm-camera: Compat changes for camera file"