Merge "Ignore nullptr in native_handle_close()."
am: 2ba8c4b0af

Change-Id: Ie5ab3f785779febbfc79e45d7f2f12097d72c274