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

Change-Id: I5e27c40c343717c81361410890924a7240c3272b