am 20432c23: Merge "Work around spurious epoll notifications." into mnc-dev

* commit '20432c237c082506cf7d45c377b778c94879b5ae':
  Work around spurious epoll notifications.