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