am ae0bf538: Merge "Avoid members with the same base name in ar\'s archives"

# By dvshkurk
# Via Gerrit Code Review (1) and Shuo Gao (1)
* commit 'ae0bf538d04d4d64cec2d753dc633a731cf45daa':
  Avoid members with the same base name in ar's archives