am 7b2c6385: Merge "Fix <memory.h> to be a synonym for <string.h> like in glibc."

* commit '7b2c6385effbb6d6e98bfe29cc6c144211128d9e':
  Fix <memory.h> to be a synonym for <string.h> like in glibc.