Merge "Camera: Cleanup 'CameraModule' dependend code" into oc-dev