Removed unguarded GCC pragma calls

These were introduced as part of a larger cleanup, and should not be
used unguarded. Reverting these, but leaving the rest of the changes
in place.

Change-Id: Iea444b14e5f82663f7f3a54cebc9e643def7f322
Merge topic 'remove-gcc-pragmas' into master

203bef87 Removed unguarded GCC pragma calls