解决编译问题
Merge branch 'master' into refs/top-bases/t/3rdTools/loki
Merge commit 'refs/top-bases/t/3rdTools/loki' into t/3rdTools/loki