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

Change-Id: I8eea0900950339980921f6629185b88c47a5190a