ThemeEngine: Unsolved conflicts while rebasing gerrit commit

Uncaught cats, can happen at 5 am.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat

Conflicts:
	services/java/com/android/server/SystemServer.java

Change-Id: I5727abd8506e6c6132ef608a3323226f63ae773d