Merge "Copy core-junit files into legacy-test." am: 69e363f506
am: 884d3ca53b

Change-Id: I6d4a760fc740620578f324de6f847a3ec59600d5