SM-2240 Fix duplication of some endorsed libraries.

See ticket for more info.