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

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

Change-Id: I14463253c218b1a6f7964566fbc1c93fe48de672