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