am 5d280a58: am 8bed8749: Merge "Fix bug number for linker related workarounds"

* commit '5d280a58a998eef06ea7d01bd5023b44fc42f19d':
  Fix bug number for linker related workarounds