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