Merge "API: Explicitly track incompatibilities with previous API versions" am: 5f76164a65
am: 5f00bf12f4

Change-Id: I3dd362b6bfc5e1caac174594221d7eb9c24c53f6