Merge "Fix dex file dependencies for oat tests."