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

* commit 'dd16573cf4b3138aa34556944f2d5146ed7a8a4e':