Clean up CameraWrapper.cpp and bring in line with CM

When I did the lg 4.4 source merge I screwed up the CameraWrapper.cpp

Change-Id: Ia92904ce63a612ab6e2c8cbf08df410c28b7545a