[automerger skipped] Merge "Change tethering file structure to respect its package name" am: c31e88ace6 am: 9fce5bc8b9 -s ours

am skip reason: skipped by user markchien

Change-Id: I23b0ffb1f366f980bc7c9c3b4c061214b8199307