Merge "Fix for duplicate names in whole static libs"