Merge "Fix build-id lookup for libraries loaded directly from apk" into main am: 8d2dcd0c5d am: 060050b95c am: 5b4c2a7c4e am: a98e146901 am: 91422e56c8

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

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