Kernel tweaker (3/3)

This also reverts commit 4353a5c17859813c36fa02ac04670fc0608d8d23.

Conflicts:
	src/com/android/settings/Settings.java