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

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

Change-Id: Ia6c8b37d39dd188fe9ea2083bdaa87664799e3d0