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

Change-Id: Idb4cb321228c962d4ae57cb7d5e4051be11c51f0