Merge "Update epoll.h from bionic"