Camera: Add Missing AF translations & do some cleanup

Change-Id: Ie83478460d1dab00beefeccff63d07bc05fab212
camera: Fix hang when changing picture size

Change-Id: I46d060d470b96be56d84f273accf54702e72b321
Merge "Camera: Add Missing AF translations & do some cleanup" into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Camera into jb-mv