Merge "API: Explicitly track incompatibilities with previous API versions" am: 2874cbe0bc
am: 6bbe7d8c71

Change-Id: I89fbdb526ab27faf35ff1f964db2555567141d88