Bug 920679 - Improve build environment detection in mach; r=glandium