Revert "Workaround for Xperia 2011 camera framerate"

This was experimental and not meant to be merged

This reverts commit fb9b365820551941474c75478dd2226ef8f90e4f.

Change-Id: I3d8e002a813866edc211cc90fdc7a7ca22bd46c8