Merge "Simplify module visibility post build refactor" into stage-aosp-master
tree: b97bcd88161bf2fa5d5750a8b0f8c0223d2b85ab
  1. Tethering/