Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb