Merge "msm: camera: CPP driver Framework" into msm-3.4