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

Change-Id: Ie679ad2aae3cd5c1857bf6b9d4e474f665e6d507