Merge "Revert "Switch adb to epoll(2).""