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

Change-Id: I55ec07039052bf6030a16bfa0cbeedc8690809f7