Merge "fix(build): fix arch32 build issue for clang" into integration