Merge "Revert "Revert "Add compatibility metadata to OTA package""" am: f9937b5c24
am: 5e15d3cce1

Change-Id: Icf50f5a83cc0dc5d0db413f6b4daea532bfbb9f8