JNI refactoring fixes. Cleanup started.
https://github.com/openpeer/opandroid/issues/466