Merge "Delete VINTF compatibility check during OTA." am: cae99c43de am: 567ae2f9e1

Change-Id: I40359f387e70e8055c12d0245a0e5d2132007889