am 92af733e: More adb buffer fixes.

* commit '92af733ee202caa3b5475fe27fcc81582f11e7c8':
  More adb buffer fixes.