Merge "Build with upstream lld: Fix incorrect static dependencies" am:...

Merge "Build with upstream lld: Fix incorrect static dependencies" am: 295f51a5 am: f1efd0fe am: 11becabf am: a6013f3e am: 40851bdf

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



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