Merge "msm: camera: sensor: Use soc_info.index to replace subdev_id/id" into dev/msm-4.9-camx