Merge "Remove GCC-specific pragma and disabled Clang warning"
am: bcf27fa6a7

Change-Id: If8aa81372dd6fcc433867892e27c37670184fbc6