Merge "Add C++ implementation of ParcelFileDescriptor" am: e3c9030dc9
am: 450bbf91e9

Change-Id: Ia437d7b09fe266699c47af876cfdda1c66fdfc07