Merge "Fix failing Libcore benchmarks."