Fix C++ compilation of NaCl VMs (re)