Android 6.0.0 release 3
Merge "memcpy is in <string.h>, not <stdlib.h>."