Merge "Build with upstream lld: Fix incorrect static dependencies" am: f6ab9183b7 am: c136d4386c am: f64db81395

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

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