Revert "Merge branch 'kk4.4' of https://github.com/SlimRoms/packages_providers_MediaProvider into kk44"

This reverts commit b0cf5247b683bdfa64e397c8f8656ae1eeb9b6af, reversing
changes made to 2e56a4d74cfcfbb060e0d8443581fc229eab86b0.
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