Merge "Use ParcelFileDescriptor instead of FileDescriptor in the aidl"