CODEX ROLLUP> RC: AOKP Ribbon

Options to control the AOKP Ribbons

Change-Id: I8a0d308cbd2a25f75d19dbd6c9df5f9dbef36686

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/preference_headers.xml

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	res/xml/carbon_settings.xml