Merge "Remove full paths from abi_diff.proto"