Merge "Add error_msg argument to CloseNativeLibrary"
am: 6590255dbb

Change-Id: I1bbe1acf3b2fb3b2ae2ee77cfacf98f750aedbd1