Frameworks : Fix face detection

I337a7a2e8b124aac76f52abcc0edd8af9b0b0e29 introduced
the ifdef's at the wrong location. This patchset addresses it.

Change-Id: I6b19fb96076bdc62b2ca57d1ccaf97f0cb901d67
merge changes from CyanogenMod 10.2 into local branch
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2