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

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

Change-Id: I95cb4e99c17c015c498a25051bb4c4c0e4bc5695