Merge "msm: camera: isp: Improve the csid resource allocation" into dev/msm-4.9-camx