Merge "Restructure Module code [ com.android.tethering ]" into stage-aosp-master