am 4d2ab4c7: Merge "Fix linker crashes during unknown symbol lookup"

* commit '4d2ab4c758a8c76193452b139778e90531721930':
  Fix linker crashes during unknown symbol lookup