Android O MR1 IOT Release 1.0.13 (5612681)
Merge "Add java.nio.Buffer helper methods."
am: 5537e461c0

Change-Id: Icae605698b4abb4dfd3b831ce6e7b33484660021