Merge "Merge "MessageQueue: explicitly remove FD event listeners." am: b43daf5f7b am: 040587641b" into pi-dev-plus-aosp
am: 1058f42271

Change-Id: I5093ca0d576473f490347ab4244af11a2835d23a