Merge "libc: remove newlines in prototypes in string.h" am: 1261f29631
am: 76cec4e133

Change-Id: I7811b34b08cb460f0d21e01b52d8f335b27cfe44