Benchmark mods to support NaCl, NaCl x86_64 build