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

Change-Id: If819a91b4081a8f8cb885b76685aa3f1ff93e1ef