merge fibjs/build with upstream
Merge branch 'master' of https://github.com/zalemwoo/fibjs