Merge "cutils: Add clang FORTIFY support" am: f2e615c7b8
am: 9a7f57b909

Change-Id: Ia12dc512d2589f63244a03909cd4e028188d0030