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

* commit '4bc5275825af47e11479b2cbff01193e90ca2ff4':
  Update epoll.h from bionic