Revert "FORTIFY_SOURCE: optimize"

This reverts commit 1e8faf0d73d7f4cf8da8a141d4749dc35b166756.
FIx linaro strings

*reverts fortify str(r)chr

Change-Id: Icb7562626f0e4a1dfa532e8fa06127fe188b603c