Merge "msm-camera: Add 8MP and 1MP sensor support" into msm-3.0