Merge "NativeLibraryHelper: Minor fixes"