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

[automerger skipped] Merge "tethering: transitive deps from jni_libs" into rvc-dev am: c46bf078 -s ours am: f6813f9e -s ours am: b2e2cddc -s ours am: aa9dbd0f -s ours
am skip reason: Change-Id Icba6ea3611c443cbf22ad6363d0239377d16ac9e with SHA-1 9618b66f is in history

Change-Id: Ifa5f48ffc07616b9ad7828376db64747be996bd3