Revert "Camera Fix:  Disable auto focus"

This reverts commit 18590db267dab0217617d3e838b9954274e6d542.

Change-Id: I8df2e4fafdc03243c67edc12e585ec1118ffc1e5
Merge "Revert "Camera Fix:  Disable auto focus"" into android-4.4