am 64dfbd24: Merge "Fix weak function lookups"

* commit '64dfbd242cddc3ef95576e27e3940d68b89b5fce':
  Fix weak function lookups