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

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

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