Working emscripten build
More emscripten/android build fixes