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

Change-Id: Ia26ef45e141fd9a1446f59f0dc7e280167177517