Revert "fix incompatibility with -fstack-protector-strong"

Reports of devices not booting with a build range including
this patch. Reverting while I investigate.

This reverts commit 96dd2b6e.

Bug: 23470962
Change-Id: I056f1d8668f52d31412868975f2143249fc7e8f0