Merge "Fix lookup-by-base-name for lp64"