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

Change-Id: Ieb3c72db216df2bd67adcd5d9efa5b374ac0dd6f