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

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

Change-Id: I04dd1537cc04816b30283563e657a1cfd74bb3c1