Revert "Re-fix Camera preview for 2011 Xperia devices"

This actually breaks camera preview now

Change-Id: I6255b722a60054592be88153ef29eaa774423fc8
Merge "Revert "Re-fix Camera preview for 2011 Xperia devices"" into pac-4.4