Merge "libnbaio: 64-bit compile warnings"