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