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

Change-Id: Icfee21339efb024559ce01ab54c44dd76f3fa830