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

Change-Id: Icd964f78e9bbfc79119672f191e3ab6f76f8e79c