Merge "Fix updating of JNI references for String.<init>."