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

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

Change-Id: Ie840473c568c4e06bac2e0b2418dc3bea29a454b