Merge "use epoll_create1"
am: 41e83c32ba

Change-Id: Ieb91451df4da298e705630c1196e437fe39ca3f2