am 589d6f45: Merge "Use longs instead of ints to store pointers in NIO buffers."

* commit '589d6f45d4c38c1d74ea970284c32ed013422eef':
  Use longs instead of ints to store pointers in NIO buffers.