Merge "Change tethering file structure to respect its package name" am: c31e88ace6

Change-Id: Ib7db789690b64ca00905577ee9ed7ed993293967