Merge "Build with upstream lld: Fix incorrect static dependencies" am: f6ab9183b7 am: c136d4386c am: f64db81395 am: 872e4e5206 am: cf3068a095 am: 7b1f517d16

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2058987

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