am c08f85a6: Fix issue 3414805 Crash during Overlay editing. JNI fixes.

* commit 'c08f85a6484ee5da7062a5eac0f19912bd7e2513':
  Fix issue 3414805 Crash during Overlay editing. JNI fixes.