[automerger skipped] Merge "Build framework-tethering against module_current"...

[automerger skipped] Merge "Build framework-tethering against module_current" into rvc-dev am: aba5f0ca am: b42d60fd -s ours am: d72b2d83 -s ours am: acdd6b13 -s ours
am skip reason: Change-Id Id6051296a02060179666b67fc6ea9092273c1780 with SHA-1 561564df is in history

Change-Id: Ifb8e1aaba498beb182755647935ba93273fff8c3