Reconciled x86 and ARM NaCl ports.