Merge branch 'LA.BR.1.2.9_rb1.22' of...

Merge branch 'LA.BR.1.2.9_rb1.22' of https://source.codeaurora.org/quic/la/kernel/msm-3.10 into cm-14.1

 Conflicts:
	drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c
	drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
	drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c