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

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

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