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
g2: enable ZSL on HDR

Change-Id: I5a9d8b8674345c52bdc4c37acb4fe60cd6ae0f23
Merge branch 'kk4.4' of https://github.com/SlimRoms/device_lge_g2-common into kk4.4