Merge "use epoll_create1(EPOLL_CLOEXEC)" am: f328edd142
am: 18c0ff2345

Change-Id: Iab7cad269b30a1b188ecf6444883871a2636f123