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

* commit '35aca4ea0003f896675e7c35781ab228029f9e74':