New Theme Chooser UI

Change-Id: I5bf43f3e14c391af3263db8f3bfb8afa39be3928
Merge "New Theme Chooser UI" into cm-11.0
manifest: Add simplerecovery (bootable/recovery-cm)

Change-Id: I3ee0149fa06d792f5c0b00c4b02f61183dab9808
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android into cm-11.0

Conflicts:
	default.xml

Change-Id: If85fcddaf905a91b0b2fb9001c02e7db1c79f52e