Revert "Camera2: Adding support for 4kx2k resolution"

This reverts commit 47e7dd7a0d40d4959f9324981830e6cbacfcfc68.

Conflicts:
	res/values/strings.xml
	src/com/android/camera/CameraSettings.java