am bce78628: am 882ff6d2: am 24c24d43: Merge "Fix updating of JNI references for String.<init>."

* commit 'bce78628aaff2803b47a53370a768390e64159e2':
  Fix updating of JNI references for String.<init>.