Revert "Camera: update to the 4.4 release from the S4 Google Edition"

This reverts commit d8a242b350a1972a389f04f07280f22d7b8d4d35.

Change-Id: I6ea00ebd6bbef19be6f5ff58b4702fdd1a76e224
Merge "Revert "Camera: update to the 4.4 release from the S4 Google Edition"" into kk4.4