Merge "Change name back to CreateJavaInputStreamAdaptor." into klp-dev