Merge "msm: camera: util: add support for i2c and spi device" into dev/msm-4.9-camx