Merge "Build tethering against the module SDK" am: 6abf8e41f7

Change-Id: If720371eac2acc92677a15f7c0c5ae55c84023a6