Merge "aflags: remove unnecessary String conversions" into main am: a0a131aa am: 0748bdfb

Original change: https://android-review.googlesource.com/c/platform/build/+/2994231



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