[automerger skipped] Merge "Switch framework-tethering to use java_sdk_library" am: 5ff91c01f9 am: 5b5d9543b0 -s ours am: a45fd5e6c6 -s ours am: 3c336447c0 -s ours
am skip reason: Change-Id Id1c2e848430c49a2da7402244814cd084f5da77c with SHA-1 a66161e98a is in history
Change-Id: I6379d3afe817057eec201635c63558847e2de3ee
This commit is contained in: