Merge "Copy junit-runner files into test-runner." am: 3e24af3eb7 am: 5d53a925a1
am: 49a848e46f

Change-Id: I92dee395822461470a5cf83d9bb63ba6ff2469c5