Update sdcard/disk mounting to work in Marshmallow+
Not entirely sure if this is working, will need a test build.
In the case of XXXX-XXXX naming only we have no way to distinguish between microSD and USB OTG, so we'll just mount the first match to external_sd and the second match to usbdisk.
Edited by g0t mi1k