Merge "ParcelFileDescriptorTest: fix PFD creation."