Revert "Settings: PerformanceControl from Omni [2/2]"

This reverts commit c4522e0eedd4891c3c44b99c9058d0c81ffea31d.

Also: Did some more clean up for Tentacles

Conflicts:
	Android.mk
	AndroidManifest.xml
	res/xml/settings_headers.xml

Change-Id: I15e204031dc8323bcfa782950548fa280b5f1931