Merge "Do not check with vendor vndk version" into main