Merge "Add library as dependency for binaries, if there is one." into main am: 2435e098a7

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

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