Merge "Remove duplicate fdevent.cpp entry" into nyc-dev