7170079: Adjustments to build-infra makefiles

Co-authored-by: Jonas Oreland <jonas.oreland@oracle.com>
Co-authored-by: Magnus Ihse Bursie <magnus.ihse.bursie@oracle.com>
Co-authored-by: Torbjorn Granat <torbjorn.granat@oracle.com>
Co-authored-by: Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
Reviewed-by: ohair, ohrstrom, ihse, jonas
17 files changed