Merge "Temporarily disable text relocation warnings for x86 libraries"