Fix mismerge

Conflicts:
	core/res/res/values/config.xml
fix mismerge pt2
Fix getTopLevelResources invocation for themechooser post-4.4.3 merge

Change-Id: I490c1dd6185fed4c5d6d66ef551644da3cf329af
Fix missing symbol error for clearKeyguardWallpaper()