Merge "Make JNI work correctly with default methods."
am: 028d1027f9

* commit '028d1027f9b6ea6c80982407984171204458ff9b':
  Make JNI work correctly with default methods.