Merge remote-tracking branch 'caf/jb_2.5' into testing

Conflicts:
	include/media/msm_camera.h
	include/media/msm_isp.h