Merge "Fix alloc-dealloc-mismatch failures in dex2oat."