Merge "Add assemble_cvd to com.android.virt"