Merge remote-tracking branch 'PA/kitkat' into remix-legacy

-Add back BootReceiver.java without Performance Settings stuff

Conflicts:
	src/com/android/settings/cyanogenmod/BootReceiver.java
	src/com/android/settings/cyanogenmod/ButtonSettings.java