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

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