style: fix missing spaces in control statementsResult of running 'hg m5style --skip-all --fix-control -a'.
includes: sort all includes
Statetrace: Accomodate cross compiling statetrace with scons.