Merge "use epoll_create1" am: 41e83c32ba am: 8825a82e2e
am: 4b52143375

Change-Id: Icc9847147575c2398abb6b0ee5e3412809e93e74