Merge "MessageQueue: explicitly remove FD event listeners."
am: b43daf5f7b

Change-Id: Ia6d04879f1007344d58ce9b9dbc5b1aeeafb1db7