Build 2 more tests with static libc++ and version script am: 7b6059387d

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

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