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: Add proximity wake flag

Change-Id: Ibd4dd080c27a983d9416d6abc42a8b7fc245bd85
g2: High-res audio support

Change-Id: I0bea6a9133fc67b728b488056495aeaf496fa2a4
Update for 20c kernel

Change-Id: Ibc4dc945f8164b446951663adbdaa1322c9be409