FIX: [droid] handle usb storage
Merge pull request #3911 from koying/fixdroidusbstorage

FIX: [droid] handle usb storage