Merge "Use String8/16 c_str" into main am: 01d236ad43 am: 190b8818ab

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

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