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

Change-Id: Id8376be06203a4b88235126d863c9ea5eaea3a38