Revert "[2/2] Frameworks: HALO"

This reverts commit be7820bb81c457169dc58a16680c4b6c660ccf65.

Conflicts:
	core/java/android/provider/Settings.java