libc: Fix memchr inclusion on scorpion

Change-Id: I0f4d31c85c8671be9790feab03469f89520763b7
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	libc/arch-arm/scorpion/scorpion.mk

Change-Id: I7644c80a3113fd03b25cb1374b62a0147fd71f82