Merge "Replace ANDROID_VENDOR with ANDROID_VNDK in versioning" into main