Merge "ParcelFileDescriptorTest: fix PFD creation." am: 527dc53054
am: 0c4bb00a86

Change-Id: I5dd148c0c9053161bc98d2e8ddad0beaadc0f217