[automerger skipped] Match the generic_64bitonly_x86_64/BoardConfig.mk to...

[automerger skipped] Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64 am: 9e8e6a73 -s ours am: b97a1055 -s ours am: 931ead1e -s ours

am skip reason: Merged-In I31fed64619e26a1c690a6cf086c644757e45a878 with SHA-1 fd5e673f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22513081



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