Merge "Use String8/16 c_str [binder]" into main