Merge "Delete VINTF compatibility checks during OTA." am: bdc465991f am: 8ca8a6d00d

Change-Id: I9d0a3698b096ec66604403f405d73c4f112f689e