Merge "Use String8/16 c_str" into main am: 01d236ad43 am: 190b8818ab am: 7b2494fa04 am: 5f50ccfedd am: 6376753f33

Original change: https://android-review.googlesource.com/c/platform/external/neven/+/2705753

Change-Id: I9b5f8f4c6cf0546312c4911a1c2b581a4a692c0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>