More run-test build determinism tweaks am: 054c800827 am: 0f66cdbe2b

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

Change-Id: I9c0b292e27c38c50410b572088a9c015e2edf5e8