am ae3154e3: am 2899c94b: Merge "Switch init to epoll."

* commit 'ae3154e3968e991fb1e9a6b47bedd1e0819f7925':
  Switch init to epoll.