Merge "Refactor oat file writing to give Dex2Oat more control."