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

Change-Id: Ie0fc832d7ca0dd3927af43b69a71254c9cd59d3b