am 76872c9a: (-s ours) DO NOT MERGE: Manually update tradefed prebuilt from jb.

* commit '76872c9af1cfa4e978192f6cafb6a6dfa1455fc3':
  DO NOT MERGE: Manually update tradefed prebuilt from jb.