Merge "Camera: Cleanup 'CameraModule' dependend code" into oc-dev am: 63eb7e79cf
am: 37636a9d63

Change-Id: Ie1b21cc44accf28a08cc33d3ec0c832c9db969f5