Merge "Fix build-id lookup for libraries loaded directly from apk" into main