More run-test build determinism tweaks (part 2) am: 4bd6795677

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

Change-Id: Ia3ff7c60ca70e24d6a1697a6a5c9f039a21ce64a