This reverts commit a481dc184f. Reason for revert: Update this change to ensure proper closure of the timerfd object. Change-Id: I14530ba77a39c77b4c7af6855ec77ba4907ab9f9
a481dc184f