Merge "Add C++ implementation of ParcelFileDescriptor"