Merge changes from topics "rename-libbpfmapjni", "rename-libtetherutiljni" am: a0eaf01dc7

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1885969

Change-Id: I620b84fd070bc85d8498db85e0a165bc28c5347e
tree: 99c57ae4641e8901a0cdc62c39fe8c6c65a04c90
  1. staticlibs/