Merge "Remove string substitution from ABI dump scripts"