Merge "Remove duplicate fdevent.cpp entry" am: 978cda5cc6
am: 1fa1791a04

* commit '1fa1791a04f03e9d3a58e599233051b94cfa08a3':
  Remove duplicate fdevent.cpp entry