Backout rev eedf61cab3fa (bug 643325) for test failures
Bug 920679 - Improve build environment detection in mach; r=glandium