(1/2) Settings: Adblocker

 Changes to be committed:
	modified:   AndroidManifest.xml
	modified:   res/values/slim_strings.xml
	new file:   res/xml/hfm_settings.xml
	modified:   res/xml/security_settings_chooser.xml
	new file:   src/com/android/settings/crom/hfm/CheckHosts.java
	new file:   src/com/android/settings/crom/hfm/FetchHosts.java
	new file:   src/com/android/settings/crom/hfm/HfmHelpers.java
	new file:   src/com/android/settings/crom/hfm/HfmSettings.java
	new file:   src/com/android/settings/crom/hfm/IntentReceiver.java

Change-Id: I8a4601d624296bd854e8ecbf91182fd97715624d

Conflicts:
	res/values/slim_strings.xml
	res/xml/security_settings_chooser.xml

Conflicts:
	res/values/slim_strings.xml
	res/xml/slim_interface_settings.xml
Merge branch 'lp' of https://github.com/BrokenOs/packages_apps_Settings into lp

Conflicts:
	res/values/broken_strings.xml