Merge "Skip vndk variants check for vendor builds"