camera wrapper: tweak stuff for apex/express

Change-Id: If9d805375c1bdb18ab6d115efaef93084de0fae1
Merge branch 'cm-11.0' of github.com:CyanogenMod/android_device_samsung_msm8960-common into cm-11.0