am 53dbd90d: am a1d1781e: Merge "Fix dex file dependencies for oat tests."

* commit '53dbd90d9398486b299ac4f5d75604b32ca7e1c7':
  Fix dex file dependencies for oat tests.