Merge "Refactor and clean up OatWriter and Dex2Oat."
am: a1b21219db

* commit 'a1b21219dbed80f8812611968b624ba8644781e3':
  Refactor and clean up OatWriter and Dex2Oat.