Merge "Extend visibility to //external/stg"