Merge "Refactor ownership in dex_ir"
am: e3435cb810

Change-Id: I4aa85b1f84b278045528d0e5c3b34bb043e94640