Merge "msm: camera2: Enhance cpp driver"