Merge "Add error_msg argument to CloseNativeLibrary" am: 6590255dbb am: 165121c0c8
am: 27052a7987

Change-Id: I4ad95df23aaa8cf98685b14936a12c0abb17ae69