Merge "libc: add const-correct string.h overloads" am: 278d31d36e
am: b79c99e300

Change-Id: Ia38d76a10a8ba29c56c6cff70702a81ffb0f3060