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

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