am 0b9a72ce: Merge "Fix lookup-by-base-name for lp64"

* commit '0b9a72ce1124f17d514b93c0d26dea76ce8069f0':
  Fix lookup-by-base-name for lp64