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

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

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