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

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

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