Android 6.0.1 release 41 (MOB30H)
Merge "memcpy is in <string.h>, not <stdlib.h>."