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

Change-Id: I5fff5eb3a301a7ff0dd44f88086fa4620d368524