buildtools解决bug
Merge branch 'master' into refs/top-bases/t/3rdTools/yajl
Merge commit 'refs/top-bases/t/3rdTools/yajl' into t/3rdTools/yajl