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