Refactor staticlibs am: 9b0df36ea4

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

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