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

Change-Id: I3c71b9b4f5f39f855565683d5911ad22b41bae4e