Merge "Avoid re-declarations of base classes in DWARF."
am: 85aa2567c3

* commit '85aa2567c3c05eae82460c73c64d06606db5743e':
  Avoid re-declarations of base classes in DWARF.