Rollback to MozBuild....
Now we can see the build in ./mach help.
Fix conflicts