am 82b69fcb: am b9c6854c: Merge "linker: avoid clobbering the .dynamic section of shared libs"

* commit '82b69fcbb3cc94bcde82c72d5c66fb3b504cdb6e':
  linker: avoid clobbering the .dynamic section of shared libs