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

Change-Id: Ib5f9f0744dbb610210394264d088df0db8b05988