[automerger skipped] Merge "Switch framework-tethering to use java_sdk_library" am: b5bf211753 am: d65294b376 -s ours am: 027e07d72d -s ours am: fdcbc6042a -s ours am: 81e7d45cb7 -s ours
am skip reason: Change-Id If5c115f482751f9f4b5f047e9e401a18e36799ef with SHA-1 e0b78577f7 is in history
Change-Id: Ideba08059ba06bb231a2edf7d8bf6d270f5850e6
This commit is contained in: