Merge "Fix destruction order in Dex2Oat."