Track 64-bit nio changes.

Change-Id: Id7a11af5f94b8ba82d42e1e7045302aca533f31a