Merge "Remove full paths from abi_diff.proto"
am: 07ab21bc9d

Change-Id: I635f23084b4df44108164b6136a49c958e98f4e8