Merge changes from topics "rename-libbpfmapjni", "rename-libtetherutiljni" am: ff81692077 am: 694ecd1c53

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

Change-Id: I97b971227845cc783936bed9907068237bb78bd1