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

Change-Id: Ia61d21bb717302025a38d1ba182da9907509d717