revert: camera: include support for face detection

The same commit as before. I hope the whitespace error does not show up again.
This reverts the face detection commit to prevent crashes on the i9300
(possible also the other devices)

Change-Id: Ie7920af71a547442581cb47715f5fb06100ac5df