Merge "Add assemble_cvd to com.android.virt" am: 9dce0711d7 am: 3063c071d0 am: 2f41d1bd10

Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1538730

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I345765229b6272424b4a592d0492af9c1eae1a89