[BACKPORT] Fix -Wstring-concatenation warnings in clang 12 am: 94ed3ab33d am: b583dd232f

Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1924038

Change-Id: Id81c325c1905db48944b0a1722651991cc6dfd13