Merge "Refactor and clean up OatWriter and Dex2Oat."