Merge "Change parameterization type in libcore benchmarks."