Merge "Build 32/64 bit versions of tests/benchmarks."