am 2018cfa8: am 394df35e: Merge "Reorganize FORTIFY_SOURCE tests."

* commit '2018cfa85d4c7f36316376f5b090be5f0d3d13dc':
  Reorganize FORTIFY_SOURCE tests.