Update some run tests to work when either D8 or R8 is used on libcore. am: 24f2c15bb6 Original change: https://android-review.googlesource.com/c/platform/art/+/3710386 Change-Id: I4c7ee34921d183f855e094c09c657d8f924179da Signed-off-by: Automerger Merge Worker <[email protected]>