Handle mass storage lun variations

Signed-off-by: David Greaves <david.greaves@jollamobile.com>