Merge "external/boringssl: update #define guards for x86_64-gcc.c."