am a818f0fa: am 91c8111d: Merge "Register jni objs in CreateJavaOutputStreamAdaptor" into klp-dev

* commit 'a818f0face6eeee24795c80f8c3b66169e75ffba':
  Register jni objs in CreateJavaOutputStreamAdaptor