Fix compilation for non QCOM hardware after 'Enhance face detection' commit

Change-Id: I337a7a2e8b124aac76f52abcc0edd8af9b0b0e29
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_frameworks_base into cd-4.3