Merge "Make NativeTestTarget more useful for benchmarking."