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

* commit '6696655ebfa8acde81df52602d834ef7b3a5d825':
  Make JNI work correctly with default methods.