Merge "Fix double fd close in SharedMemoryParcelable." into oc-dr1-dev am: f5095b3373
am: c936d84f55

Change-Id: I4eff9faf89dfe72f40e8af6547bc6454eccb92db