Merge "Add explicit -m32/-melf_i386 for x86 target"