Merge commit '78a76fea28b8101c1860a2f1115329e3e63abda3' into gingerbread-plus-aosp * commit '78a76fea28b8101c1860a2f1115329e3e63abda3': Revert to using epoll_wait().
Merge commit '78a76fea28b8101c1860a2f1115329e3e63abda3' into gingerbread-plus-aosp * commit '78a76fea28b8101c1860a2f1115329e3e63abda3': Revert to using epoll_wait().