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

* commit '24624bb713e148aac43b3a8853d518efadcec1fa':
  DO NOT MERGE: Manually update tradefed prebuilt from jb.