Merge push-and-run-{prebuilt}-test-jar files.

Can't find a reason why those two files forked...

Change-Id: I5ef3dd76aa3b2d843c8b4b57365edec3bf2c3f3b
3 files changed