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

Change-Id: Ia4537ab0db75eabe8b3bf3fc07585a36769727f8