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

Change-Id: I337a7a2e8b124aac76f52abcc0edd8af9b0b0e29
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2