[automerger skipped] Merge "Switch framework-tethering to use java_sdk_library" am: b5bf211753 am: d65294b376 -s ours
am skip reason: Change-Id Id1c2e848430c49a2da7402244814cd084f5da77c with SHA-1 cbac8e0b63 is in history
Change-Id: I1f0759e84c6f7e17427165fc6db9dd7531284e8a
This commit is contained in: