Merge "Use String8/16 c_str [aosp-main-future]" into aosp-main-future