Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1

Conflicts:
	src/com/android/providers/media/MediaProvider.java

Change-Id: I553023304307168e6e6e0cb5a98372cc068659e3