Merge "Build with upstream lld: Fix incorrect static dependencies" am: 295f51a512 am: f1efd0fe3a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2061692

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