am 7d2519e1: am 07006ce7: Merge "adb: make shell protocol work again."

* commit '7d2519e10f3342e89f69b004442d4cb7716df3c4':
  adb: make shell protocol work again.