Merge "ARM: msm: camera: Add multi-type support for i2c data" into dev/msm-4.9-camx