Merge "Handle null FileDescriptors passed to native methods."
am: 25bc7b1679

Change-Id: I913b2b9599ef17e69cbef3a8d557628a85e27820