Fix duplicate memchr inclusion

Change-Id: Iec98e001e3811d0969ac133d434b4eeecb1b1de7