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

Change-Id: Ia9717d403dda0a2cdd61b98ebb4c3f04c5eb94ab