Merge "Switch framework-tethering to use java_sdk_library"