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

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