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