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