implement conditional compilation for js
update android submodule
fix crash on Android
Merge pull request #50 from vedi/js-bindings

Js bindings - conditional compilation for JS and Android crash fix
Merge branch 'js-bindings'

* js-bindings:
  fix crash on Android
  update android submodule
  implement conditional compilation for js