Intergrate Viper4Android into settings

Change-Id: I40dbe6f5ddbc737c0ab8e05389ab117c83f1cd1d

Conflicts:

	res/values/liquid_strings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/Settings.java