ARM: 7420/1: Improve build environment isolation