am b05c061e: am 4bc52758: Merge "Update epoll.h from bionic"

* commit 'b05c061e501ef35b6b988e5f1f99ecb670d01bbe':
  Update epoll.h from bionic