Merge "Platform Compatibility framework: annotations & basic API." am: 7e391faa2f
am: 5a71074adb

Change-Id: Ic9a3fb9778b163ea4b8ff533845315d8b9b8d3e6