Merge branch 'dev-2'
Merge branch 'dev-2'
Merge branch 'dev-2'
Merge branch 'dev-2'
修正build_macro脚本错误
应用build脚本改动

Merge branch 'dev-2'

Signed-off-by: 宋万鹏@HP-CQ42 <swpustc@mail.ustc.edu.cn>