Run test run: Don't use arch guessing heuristics (part 1) am: 69f7acafcf am: 5a7df3405c

Original change: https://android-review.googlesource.com/c/platform/art/+/2309352

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