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

* commit 'f99aa28053a358d9788049932c5512547728e2ef':