Merge "gn2bp: Make ldflags arch specific" am: e6a3471131 am: c47e912d95

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

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