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

Change-Id: I9239d238e51c61c6646022f64917348af27179ab