Merge "Re-enable dex2oat_test copying dex test case for target"
am: b4d3e6c90f

Change-Id: I8c663056cbaa0513e3852b659d3ee07d4f6aa00f