Fix Building

Conflicts:
	configpanel/src/com/cyanogenmod/settings/device/KeyHandler.java