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

Change-Id: I9e2ffa25d77cb18dbd82515d6814064878f262c1