Merge "msm: camera: resource manager related changes." into msm-3.4