Handle mass storage lun variations

Signed-off-by: David Greaves <david.greaves@jollamobile.com>
Merge pull request #19 from lbt/hybris-10.1

Handle mass storage lun variations