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

* commit 'fe147700d228c9337474ff7203105197538e5051':