Merge "Add more flexibility to abi checking."
am: 9bfbde9ef9

Change-Id: I6dcd3ab95053fcac0ed399d82c2bc3724bb46a10