Merge "Use ParcelFileDescriptor over FileDescriptor"
am: 56f111e13b

Change-Id: I68c75d02a4eb4bc74fb83efe12ec5dce8d41f7f3