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

Change-Id: I6c308a5dd9329fa2fd58cbac1ee56841520545ba