Merge "Switch framework-tethering to use java_sdk_library" am: 5ff91c01f9

Change-Id: I9e5526a23087dd9d9610b4ce5e29e28a7dfdda4f