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

Change-Id: Ibc0b1b7b432cc6357efac907258e4066aef6394a