Merge "Add support for passing bootloader and disk images." am: 33ffb2e0dc

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/1601994

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If184a681e322bbbaa1fe3436a2ddab5d6796e4c0