Merge "SDK: adjust reported OS/JVM name/arch."