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

Change-Id: Ib0c8eee5debf79db83ff8459bc39f7f4d1297540