Bring in Profiles support from mr0

Change-Id: Icae838838ce2c34aec22c50f166b957205db8394

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml
Fix build
Settings: Add Utility function

Change-Id: Ic5316765d3db48351a9feaa9b3cce286d256071e

Conflicts:
	res/xml/settings_headers.xml
fix build