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

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

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