Merge "Remove string substitution from ABI dump scripts" am: d5a53111c1 am: 1c8d200661 am: 3b9c7009c7 am: 25fa0cc3f9

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

Change-Id: I9a6eb9d0998688b0d1865a2a8f7c8a3d074f6e6e