Merge "adb: use poll instead of select in shell_service."
am: 27fa358d41

Change-Id: Icba2b4ca0304e6808fd9c54215cb816e1ef51d58