Merge "Add -Wl,--no-fatal-warnings to x86 build (continued)"