Merge "Fix resourcesMap to work with shared libraries"