am 31101623: Merge "Fix for duplicate names in whole static libs"

* commit '31101623b3e621436f6b46f49242ed4642d86164':
  Fix for duplicate names in whole static libs