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

Change-Id: If2f21fa653b05f14c3534090a98258c925006c81