Merge "Merge "MessageQueue: explicitly remove FD event listeners." am: b43daf5f am: 04058764" into pi-dev-plus-aosp