Merge "vbox: add a ready-to-boot android_disk_vdi target"