Merge "trusty: trusty-storage.mk: add support for Trusty VMs" into main