Merge the emscripten part with the last incoming branch
Build samples with last emscripten