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

* commit 'cfdfbb22e9b8ef2b247bd711ee73bbe58a1bea16':
  Fix destruction order in Dex2Oat.