[automerger skipped] Merge "tethering: transitive deps from jni_libs" into...

[automerger skipped] Merge "tethering: transitive deps from jni_libs" into rvc-dev am: c46bf078 am: 07074804 -s ours am: 3606cd60 -s ours
am skip reason: Change-Id Icba6ea3611c443cbf22ad6363d0239377d16ac9e with SHA-1 55d9376f is in history

Change-Id: I8796d0db8153fc982a85723cfbfc907819a094a7