Disable camera again
Merge branch 'master' of https://github.com/cm-10-2-marvel/android_device_htc_msm7x27-common