Merge "Fix GetResourceName for shared libraries"