Fix build in u8500 Devices

Change-Id: I7bbc57a0998593aaf5cfb82f2b3459629114ddd8
Revert "Re-fix Camera preview for 2011 Xperia devices"

This actually breaks camera preview now

Change-Id: I6255b722a60054592be88153ef29eaa774423fc8