Merge "Fix our fortify tests for global -Werror."
am: 3e75110bcb

* commit '3e75110bcb1d7b941ab0633e7e5c36c604512ded':
  Fix our fortify tests for global -Werror.