Merge "trusty:storageproxyd: Add ufs to parse_dev_type" am: d363769dcf am: 22ad80da60

Change-Id: Ibdcaacef49dcb4fd4a20850fb6ae08a8c52a221a