Merge "msm: camera: Fix compilation for 7630" into msm-3.4