Merge "Fix `arm_v7_v8` device config." into main am: da18e01a1e

Original change: https://android-review.googlesource.com/c/device/generic/art/+/3204993

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