Merge "Use ParcelFileDescriptor over FileDescriptor" am: 56f111e13b
am: d0ad6794d4

Change-Id: Id53a5c0f7d56b2dcde839052e2e7c040c9751d69