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

* commit 'c01394ff7097995e4d7d7d65546abd0e1842dcef':