Make artd tests work well enough on master-art. am: 69a57a75cf am: d0ded311bc am: 33d2760366

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

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