Update for SWIG/Android
Fix Callable/Observable for SWIG