Merge "Remove unused libraries" am: e4848734a9 am: fb73190bd6 am: 634caed0bc

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

Change-Id: I479739b66c4c06fe19d4de05122963ccfd3406d5