fix NPE

Change-Id: I0c33def8a8cf1cde32ea7fcb6ef28ed1f41465cf
Remove T-mobile items not used by new theme engine

Change-Id: I1e9c14e63ec25fdff61cfd2b7b8a05b1e488e558

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/AssetRedirectionManagerService.java