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

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

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