Revert "camera: add support for various scene modes"

This reverts commit 9d1c1bdd64a20427e5db1ced4d11894c5761ff56.
Revert "camera: add support for various focus modes"

This reverts commit 929dfe0ede807e4b6f385c277d00c55ac250d0a5.
more exposure controls, hdr, hox scene modes, 6mp wide pic size

Conflicts:
	src/com/android/camera/CameraSettings.java