Merge "v.io/x/jni: Support for the ref fix"