Merge "MessageQueue: explicitly remove FD event listeners." into pi-dev
am: 6f42d1bac2

Change-Id: Ia2f49f6d20d495fcc01e1a5a42a0be207042c92f