Merge "Build with upstream lld: Fix incorrect static dependencies" am: 2c76c6867e am: 5f96cab8c0

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2056641

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