Merge "fix(build): partially fix qemu aarch32 build" into integration