Revert "Allow changing theme to Holo.Light without crashing"

http://review.cyanogenmod.org/#/c/70745/ solves the issue
that this patch originally was created for.

This reverts commit 8cc23d58abc4874fe049a8dfa70910cf0b5dd9b2.

Change-Id: Ia350a03749202a2c0ae809400a3ebb554551d601
Signed-off-by: anerikg <anerikgames@gmail.com>

Conflicts:
	res/values/themes.xml
Settings: Remove leftover from old theme chooser

Change-Id: Iaf97e2b94c27839eb4f9827a77917fe21a311b4c
Settings: Add proximity wake-up

Change-Id: I2f2449eb324f61b2f7a93acd91b99f144930e66e
Signed-off-by: anerikg <anerikgames@gmail.com>

Conflicts:
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
Settings: Update Legacy Options' Position

PS6:
- Fix imports

PS7:
- Fix layout resources

PS10:
- Test onPrepareOptionsMenu changes

PS13-14:
- Rebase

PS17-18:
- Redo

PS19-20
- Remove CM's Performance Settings, whitespace fix

PS21
- Fix a build error

Signed-off-by: Andre Saddler <ayysir@aospal.com>
Change-Id: Ife7b152a832ebdd9b5eb066158e0d71fc834dc73
Signed-off-by: anerikg <anerikgames@gmail.com>

Conflicts:
	res/xml/display_settings.xml