Merge "Fix AArch32 build error"