Merge "MTP: Changes to support /mnt/sdcard paths from MediaProvider."