Merge "Partially Revert "Check VINTF compatibility at OTA generation time.""