Merge "Revert "Match create_composite_disk to crosvm updates"" am: 51345a7c8b am: 452ebe4b6a

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

Change-Id: Ie7527ce283329932cfc1f2b2fa3365850dff3d2c