Squash 4.3 changes.

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

Change-Id: I07925558c2ca7720ff2a3c163978d34d0a009b64