Merge "Log error message if CloseNativeLibrary fails"
am: b79d19503e

Change-Id: Ief2e178afe9b377b1ad833a92184e0730432ec08