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

Change-Id: Id2ffd714a330ec526a896783beafff71aec4710f