Add more flexibility to abi checking.
am: fbbce47234  -s ours

Change-Id: Ibe7a7a95fe8cc1b3d41cc65668db0ef9e849494e