Merge "Fix destruction order in Dex2Oat."
am: 6a877d02da

* commit '6a877d02da8fdc5e4adf975ed790931c5b4de838':
  Fix destruction order in Dex2Oat.