Merge "Fix linker error with upstream llvm" am: ce11dc9a2d am: 2a7549201a am: d2ca788472

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2133158

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