am de3faec6: am fd18d9e2: Merge "adb: put legacy shell: service back in."

* commit 'de3faec64d407e76013913cb39cf569f692e8f8f':
  adb: put legacy shell: service back in.