am dc3ad87c: am 78a76fea: Merge "Revert to using epoll_wait()." into gingerbread

Merge commit 'dc3ad87c04348c925aa86863ed6d25f18a8c6c36'

* commit 'dc3ad87c04348c925aa86863ed6d25f18a8c6c36':
  Revert to using epoll_wait().