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

Change-Id: I95f3c2005e87f86f7014f6bf693eae7212f54a73