Merge "Revert "Write dex files to oat file early.""