Fix Cortex-a15 compile

Change-Id: I751d2cb7535df897f172584227bd9eccff40f7d8
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Revert "Don't include memchr.c twice"

This reverts commit 23ce68b4084248042320f1b0368ee8e1e4f1bcf1.