Merge "libc++: Make string.cpp compile on Android."