Merge "Revert "Add compatibility metadata to OTA package"" into oc-dev
am: 533183dc68

Change-Id: Iacede7d5a6357c91e86a8bc8dbf113b991e2765c