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

Conflicts:
	AndroidManifest.xml
	src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java