TEST; Revert "CM10 camera hack"

This reverts commit a606a830c7a4af042a8cbc07363ca804e6eafab4.

Change-Id: I8914f8c3a574c6cbde0a8cef9e1ceaf46cea439f