Merge "Use String8/16 c_str [tools]" into udc-dev-plus-aosp