Merge "Fix JNI for warning about failure to unlink DeathRecipients"