Merge "Handle null FileDescriptors passed to native methods."