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

Change-Id: I2c5519b464a8249699c655729d18509461d3f65d