Fix branch super-derps

Change-Id: I04e09a03f3c36ef9a042c3e9b374c1dd755e227e
Revert "remove klingon from user rotation mode"

This reverts commit 87a9a5caa65b14a1f9e54cea32336df41be13251.
Revert "Configurable 0, 90, 180 and 270 degree rotation (2/2)"

This reverts commit e0edde2a808fa0950c2da2a9ee468b16a2ee850b.

Conflicts:
	res/values-es/strings.xml
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/DisplaySettings.java

Change-Id: Id00641f6cde91318e077a6c320adf0ce5bf55aea
Upstream Merge + CM Advanced Re-commit

Change-Id: Ica783c3c175ecafd1dade07f8831d263d4f8f479