fix atomics for asm
Merge branch 'incoming' into asm_js_nomerge