CM11 Themes: Properly handle SystemUI theme package name.

Change-Id: Ia8915684e1620184dcc513c2c5039ea20aabbd04

Conflicts:
	core/java/android/content/res/CustomTheme.java
	services/java/com/android/server/ThemeService.java