am e64e371e: am 95e6c6a5: Merge "Improve java.nio.Buffer.toString."

* commit 'e64e371e23f59a434fe7584cbfd7aba81a41bd6d':
  Improve java.nio.Buffer.toString.