Merge "Fix memory leak after calling CloseNativeLibrary."
am: 3c29c66933

Change-Id: Ie710c8420911270f5abe56363c0bacb1a1271d97