Fix a few derps

Hardware tunables derp and leftover hardware keys code fragment...

Change-Id: Idff8821d0f45ff6d2d8d86e72f2bd5697ac94610
(cherry picked from commit b86bd1bb20a18f1164a09cf5cc8b1db4f30ced4a)
Merge tag 'android-4.3_r3' into HEAD

Android 4.3 release 3.0

Signed-off-by: Evan Anderson <evan1124@gmail.com>

Conflicts:
	res/values/strings.xml
	src/com/android/settings/WirelessSettings.java

Change-Id: I5ee126906cf8c0d37c17a5e43d79ac4487785ef4
(cherry picked from commit 20a63604645c75614a2990283b1021b4168c86df)