am 3805f619: Merge "Revert "Fix for duplicate names in whole static libs""

* commit '3805f619156163eab8ad92fd51b4a431be1287bd':
  Revert "Fix for duplicate names in whole static libs"