Merge "Always build system and vendor policies (and related artifacts)."