[automerger skipped] Merge "Build tethering against the module SDK" am: 6abf8e41f7 am: fdcab3c71c -s ours am: 82b68376aa -s ours am: 4712f7a266 -s ours
am skip reason: Change-Id I7c93b60654e21a4a27d21cbf0c2a6cb21f813529 with SHA-1 aaeaa195b8 is in history
Change-Id: If20d733e14df608a6fa0869ca6b3eb15bc26fea2
This commit is contained in: