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

* commit '0778b4b3d8810a77593f033e50bee0302dca34be':
  Work around spurious epoll notifications.