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
g2: Make audio not suck anymore.

 * Add support for additional low-power offload modes
 * Enable gapless playback support
 * Enable 24-bit playback
 * Enable the compander for increased dynamic range on headphones
   and speaker output

Change-Id: If8cae7e940ba753d8b155017b15239bb49616b72
Signed-off-by: bart452 <bart4524@gmail.com>