Merge "Attempt to fix dx-tests to run in CI as a unit tests" am: 27d7b79d6d am: 808547956e

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1601095

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4368af76b63776d18e4894ce7d7c107f3fa3be82