Merge "Fix NFC JNI local reference and pin table leaks."