Android 6.0.1 release 33
Merge "memcpy is in <string.h>, not <stdlib.h>."