Merge "Fix JNI leak in copyStringToBuffer Bug: 5244396"