Merge "Add more comprehensive tests for abi diffing." am: ececbc0001
am: 87c885dd5a

Change-Id: I956084ed118b131e7256d53ce26126395053ab79