Merge "Fix build id check for libraries." am: 9d99dc95aa am: 842e5cf4f7

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

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