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

Change-Id: Ia6b70dd1c5b40133dc65cceb898002f418d910a5