Merge "tethering: transitive deps from jni_libs" am: 20b4ccfe am: 0c1e585a am: 1544f9e6 am: 913ef19d Change-Id: I20f662a2049b33ee5d10413bd85d9330180de91c