Merge "msm: camera: Add support for combo mode" into dev/msm-4.9-camx