Merge "Use ParcelFileDescriptor's C++ implementation in libbinder" am: 20e243d627
am: 9e2177b492

Change-Id: Ica2a4ef98eba9a5360398b6d5a05f141e0bb6f93