Merge "Revert "vm: DRY *Config structs w.r.t. aflags using cfg_if"" into main am: 47a07eb536

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

Change-Id: I82b81236efb9a8150fd381594e8137aa26ec1c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>