[automerger skipped] Merge "Change tethering file structure to respect its package name" am: c31e88ace6 am: e6c78e3e6f -s ours am: 32dd13363c
Change-Id: I9f5ea3568621f7350bb8d3314a4b8dc0ee5bdc67
This commit is contained in: