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

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