Merge "SharedLibraryInfo.isNative() returns true for native libs"