a4b47b89fd
this restores the previous version's behavior avoiding issues with builds that may split sources on directory boundaries; protected visibility may work in this case. Change-Id: Ie759bd96c9ea5b45613f450dffa6e67eb45f5a8b