[automerger skipped] Merge "Change tethering file structure to respect its package name" am: c31e88ace6 am: e6c78e3e6f -s ours
am skip reason: skipped by user markchien Change-Id: I23b0ffb1f366f980bc7c9c3b4c061214b8199307
This commit is contained in: