Revert " [2/2] Frameworks: HALO Forward port from jb."

This reverts commit 4819b82e16ea55ad7e61588ce8ef299245943874.

Conflicts:
	core/java/android/app/Activity.java
	core/java/android/content/Intent.java
	core/res/res/values/cr_symbols.xml
	packages/SystemUI/res/values/axxion_dimens.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	services/java/com/android/server/NotificationManagerService.java