[automerger skipped] Merge "Build connectivity JNI against libc++_static" am: 84061f6102 am: 70212c3310 -s ours am: 9c01a8d4b3 -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722743
Change-Id: I9e81bc2c1c25d1208813a1d17327293e759ca3ae
This commit is contained in: