Merge "Use PLATFORM_VERSION_CODENAME for VNDK version"