Merge "Remove copy and leak of dex data."
am: c5a319ca5f

Change-Id: I617d9f055ff3c2f34461d68e1b198c98bd424958