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

Change-Id: Ibcee49b3636fa2c4e84ffac6311567b00fd0267b