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

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

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