Droid removable storage fixes

To @koying and @davilla for review, please.