Merge "Add cstr! macro" am: 23bdd39f9f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2498518

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