am 6b8b3dd2: am 64dfbd24: Merge "Fix weak function lookups"

* commit '6b8b3dd28a145021281f69b485763748f29b7b03':
  Fix weak function lookups