fix the build and keep old theme manager

Change-Id: Id5f172fbe614acaa7417ab103bab27bdb55a30ef
Signed-off-by: scott <scott@ubuntu>
Merge remote-tracking branch 'upstream/kk44' into default

Conflicts:
	default.xml

Change-Id: I376bd9037f3fdd96796c23aa3a3cc5511f4812a8