Camera: Add Missing AF translations & do some cleanup

Change-Id: I58cbf18d0608391da4f6ca2bff287c62cf89e5b8
Merge "Camera: Add Missing AF translations & do some cleanup" into cm-10.1-staging