am fc1b34b0: am 9664c089: Merge "CUSTOM_TARGET_LINKER is set by the buildbot already."

* commit 'fc1b34b0dd2a6982992528ee0823e4030e108daa':
  CUSTOM_TARGET_LINKER is set by the buildbot already.