Merge "ParcelFileDescriptor: fix various ownership mistakes." am: 8d7976a37e
am: d152e75a7c

Change-Id: I3e20c989ed4ea141c14163421ce02b7d2c4c1470