Add per policy required build-arch/build-indep