Merge "Refactor oat file writing to give Dex2Oat more control." am: d1744d449c
am: 110d07e2c0

* commit '110d07e2c0bc54733246374f335123c44fb6e702':
  Refactor oat file writing to give Dex2Oat more control.