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

Change-Id: I8fd5001f2bf0e0240e5418582de79fe942c1bf34