Merge "Add cstr! macro" am: 23bdd39f9f am: a35dc5f0de

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

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