Merge "MessageQueue: explicitly remove FD event listeners."

am: b43daf5f7b

Change-Id: Ia6d04879f1007344d58ce9b9dbc5b1aeeafb1db7

core/java/android/os/MessageQueue.java

@@ -254,6 +254,7 @@ public final class MessageQueue {
         } else if (record != null) {
             record.mEvents = 0;
             mFileDescriptorRecords.removeAt(index);
+            nativeSetFileDescriptorEvents(mPtr, fdNum, 0);
         }
     }