[automerger skipped] Use String8/16 c_str am: 265e1f7c97 -s ours am: fa84ce021e -s ours am: cd4997f542 -s ours

am skip reason: Merged-In I83f24914c9db7cab6d00256dd1b849c8cd077b4a with SHA-1 ba7ce88f55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/zuma/+/24775018

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