Fix ocasional Camera FC

Conflicts:

	src/com/android/camera/PhotoModule.java
option to disable face detection on rear cam