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

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

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