v2.4.4 backport of a subset of MR !1014 changes

Backport the MR !1014 (closed) changes applicable to adding the xilinx21_1_aarch* platforms.

The xilinx21_1_aarch32 and xilinx21_1_aarch64 platforms build/install successfully in the release-2.4.4 branch.