am 26fdf5f5: am 8ea23afb: Merge "Make NativeTestTarget more useful for benchmarking."

* commit '26fdf5f5e6d6647184ffa162ceaf5d50df3a53cc':
  Make NativeTestTarget more useful for benchmarking.