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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95974304d07396b11ebb00a9511f5389cc3ff810