am de814ee5: am 449831f8: am 340e9691: Merge "Include <string.h> for memset."

* commit 'de814ee5687385b34ea4de30f8ef321c4c48a5c4':