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

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