Revert all changes to CameraWrapper

Change-Id: I5a6267d1bbca7c70d0c05b28f95b9de45eae09bd