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
Merge remote-tracking branch 'upstream/ose' into ose

Conflicts:
	res/drawable-xxhdpi/prd_ic_boot.png
	res/drawable-xxhdpi/prd_ic_icons.png
	res/drawable-xxhdpi/prd_ic_style.png
	res/drawable-xxhdpi/prd_ic_themepacks.png
	res/drawable-xxhdpi/prd_ic_wallpapers.png
	res/xml/settings_headers.xml