Merge "msm: camera: isp: use a spin_lock instead of a rwlock" into dev/msm-4.9-camx