Merge "Use String8/16 c_str [tools]" into udc-dev-plus-aosp am: b370693c am: 64441287

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24484497



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