am 13d77b6c: Merge "Use linker -Wl,--wrap=symbol"

* commit '13d77b6c070e32adeb12d0c2d4c0870be2eed06b':
  Use linker -Wl,--wrap=symbol