Merge "msm: camera: Add shared gpio and flash support" into dev/msm-4.9-camx