Fix Derp

Change-Id: I77f8bb2c9d1e7210912c3261e398847c15c9beaa
True View from SlimRom

Change-Id: If5d62faed05134d3ec1690a6feefb0601bb8852b

Conflicts:
	src/com/android/camera/VideoController.java
Revert "True View from SlimRom"

This reverts commit adc7192f34fb32836b9157308d72f8e942ee83a2.