camera: Better fix for face detection score issue

 * Do this at the lower layer so that third-party apps don't have
   issus with the nonstandard score.

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