Merge "Track 64-bit nio changes."