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

Change-Id: Ia4741bcdcbfb60d2844cb56a34b824fc8595c34a