[automerger skipped] Merge "Build tethering against the module SDK" am:...
[automerger skipped] Merge "Build tethering against the module SDK" am: b4580f62 am: 6e8f8cfb -s ours
am skip reason: Change-Id I7c93b60654e21a4a27d21cbf0c2a6cb21f813529 with SHA-1 383321e9 is in history
Change-Id: I1f1e4179236397649989ed7bff24d99ed5bada6b