Merge "use epoll_create1" am: 3bd9bfa9fa
am: 225ae4d0a5

Change-Id: If20ac134284b2f96ab49355d7f26fa3c646092d8