Merge "Refactor ownership in dex_ir"