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

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

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