Fix wrong cherry-pick from: 4.4.4 probably break stuff

Change-Id: Icca4c20e976c7dec5e4575a77e144a4b4062e589

Conflicts:

	default.xml
Merge "add htc evita and change to my ville tree supporting new hboot" into kk44
Track vanir ThemeChooser

Change-Id: If5ce9cd84212a9ca8adb5ef6863c860e34bff69f

Conflicts:

	default.xml