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