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

* commit '1c290a5fe7ec2744bec98fc019986f76e0f790a6':
  Refactor oat file writing to give Dex2Oat more control.