Merge "Add error_msg argument to CloseNativeLibrary"