am 0df62a7e: am 8e1e5415: am 5b4a1767: Merge "Revert "Switch adb to epoll(2).""

* commit '0df62a7e1511667043ced8f57b2dab072fb88dd5':
  Revert "Switch adb to epoll(2)."