Merge changes I8bdb4c74,I613a7d03 into qt-dev am: a09ee2d39f

am: 036d594c69

Change-Id: Ib925304a870e5d9881147eaa9831e57be4dda6a9

core/java/android/os/SharedMemory.java

@@ -259,6 +259,9 @@ public final class SharedMemory implements Parcelable, Closeable {
             mCleaner.clean();
             mCleaner = null;
         }
+
+        // Cleaner.clean doesn't clear the value of the file descriptor.
+        mFileDescriptor.setInt$(-1);
     }
 
     @Override