Fix lookup-by-base-name for lp64

Bug:https://code.google.com/p/android/issues/detail?id=6670
Change-Id: I5b70e7cde7f40799148aca0a91fb2bb08e0f2b54
Merge "Fix lookup-by-base-name for lp64"
auto-merger: merge in from aosp/master