am 8571397a: am ef9e04b2: am 66f5affb: Merge "Fix bug number for linker related workarounds"

* commit '8571397a0f99fd29b62e19219f1aa2d5b6894b9e':
  Fix bug number for linker related workarounds