Add new themes items to personalization menu

Bring in logic for the new chooser. If TMO chooser is installed it will get
first priority.

Change-Id: Ia8e852e5e5ad2465d0b9b73f16c7080a7337bb8a

Conflicts:
	res/values/cm_strings.xml

Comment out wallpaper stuff

Conflicts:
	res/values/liquid_strings.xml
	res/xml/settings_headers.xml
Merge remote-tracking branch 'upstream/kitkat2' into kk44