Fix upstream merge fallout.
Jemalloc: Switch to my (Richard Diamond) fork for PNaCl support. Bump commit.