Revert "Camera: port additional settings from jellybean 4.1 (Round 2)"

This reverts commit 9180d3256783a9c27b02caa2e515402a53c2473d.
Camera: port additional settings from jellybean 4.1 (Round 2)

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

Change-Id: Ib2c2c152a52b2616dd0da6f071f572d34fe64065