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

# By dvshkurk
# Via Android Git Automerger (2) and others
* commit '97df262f2fd351a399bc757d3f7e7c7bb3b00065':
  Avoid members with the same base name in ar's archives