Merge remote-tracking branch 'aosp/kitkat-mr1-release' into HEAD

Conflicts:
	AndroidManifest.xml
	src/com/android/mms/ui/ClassZeroActivity.java