Merge "Build framework-tethering against module_current" am: 6deeff34 am: bb0fc42d am: 4a7aa0b2 am: f2bc0f5b am: 5c4c2213 Change-Id: Id6051296a02060179666b67fc6ea9092273c1780