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

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