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

Change-Id: Ibb6f7b4b298bbcf1f65ac913ca30ac48265836ce