Merge "Allow shared lib and package name to match"