[automerger skipped] Use String8/16 c_str am: ba7ce88f55 -s ours

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

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

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