Merge "Revert to using epoll_wait()." into gingerbread