Merge "Build framework-tethering against module_current"