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

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

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