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

* commit '07006ce756c6bf8cff745ca85dafb89ebcba37f6':
  adb: make shell protocol work again.