am df6ba9a0: Merge "Fix updating of JNI references for String.<init>." into mnc-dev

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