Fix CameraWrapper to work with CM Camera2

Change-Id: I2388ad09ee55bf72c28f7836f1b3a378858e2647
Merge branch 'cm-11.0_hybrid' of git://github.com/vigor/android_device_htc_msm8660-common into cm-11.0_hybrid