am 5b4a1767: Merge "Revert "Switch adb to epoll(2).""

* commit '5b4a1767f6e4802c99071305e5b69b1ed22ad292':
  Revert "Switch adb to epoll(2)."