Fix tinderbox build breakage.

Note that it is committed on the vendor branch because it will be
submitted to the vendor.