Merge "use epoll_create1"
am: 3bd9bfa9fa

Change-Id: I0a66bf8208720a547ead4358313f7d34f3a9b8ad