Camera: port additional settings from jellybean 4.1 (Round 2) - CM

- add touch-to-focus timeout duration settings
- add volume button zoom controls to camera and camcorder
  (Panorama does not support zooming)

Change-Id: Ib2c2c152a52b2616dd0da6f071f572d34fe64065

Conflicts:
	res/values/arrays.xml
	res/xml/camera_preferences.xml
	src/com/android/camera/PhotoController.java
Bring back ISO options