Merge
8142336: Convert the SA agent build to modular build-infra makefilesReviewed-by: ihse, sla, dsamersoff, twisti