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

Change-Id: I1673c92ae8985e8ef681ea91a89ff237232be931