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

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