Copy junit-runner files into test-runner. am: eef35dd29a
am: b46cecb6c4

Change-Id: I8f75a351d8e697b2fdbc4e1b3d06fd4ea25ffb0a