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

Change-Id: I93458fee3894a456f202f1e117538a9e0a81cf7a