Merge "Fix build-id lookup for libraries loaded directly from apk" into main am: 8d2dcd0c5d

Original change: https://android-review.googlesource.com/c/platform/development/+/2755087

Change-Id: Ic52d635bafc33d9cfa71d461f122bb49438fc056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>