Completely integrate HFM into Settings [3/4]

Change-Id: Ic0e22caf7e9bd64c8f5e0975777d80e352039f05

Conflicts:
	config/packages.mk

Conflicts:
	prebuilt/etc/hosts.alt
Merge branch 'ose' of github.com:Team-OSE/vendor_ose into ose