Minor fixes for nm mapping #103468

Job	Run time
Build framework (macos-release, -sdk macosx -configuration Release)	22m 30s
Build framework (macos-release, -sdk macosx -configuration Release)	22m 30s
Build framework (ios-release, -sdk iphoneos -configuration Release)	10m 0s
Build framework (ios-release, -sdk iphoneos -configuration Release)	10m 0s
Build framework (tvos-debug, -sdk appletvos -configuration Debug)	9m 15s
Build framework (tvos-debug, -sdk appletvos -configuration Debug)	9m 15s
Build framework (watchos-debug, -sdk watchos -configuration Debug)	17m 22s
Build framework (watchos-debug, -sdk watchos -configuration Debug)	17m 22s
Run framework tests (asan, -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES)	35m 45s
Run framework tests (asan, -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES)	35m 45s
Run framework tests (tsan, -enableThreadSanitizer YES)	55m 15s
Run framework tests (tsan, -enableThreadSanitizer YES)	44m 2s
Run framework tests (leaks, ENABLE_LEAK_DETECTION=1)	46m 26s
Run framework tests (leaks, ENABLE_LEAK_DETECTION=1)	46m 26s
	6h 21m 53s

Provide feedback