Merge "Remove string substitution from ABI dump scripts" am: d5a53111c1

Original change: https://android-review.googlesource.com/c/platform/development/+/1358242

Change-Id: I5fc7e8a835c80ce296de6d89d5563ac2ab97c772