Merge "Simplify module visibility post build refactor" into stage-aosp-master