am edbd5fd7: Merge "Fix whole static lib handling of duplicate names."

* commit 'edbd5fd7e6e7dd54417dee96e230f774903d052b':
  Fix whole static lib handling of duplicate names.