Remove remaining use of JAVA_X_HOME
#10340
+294
−163
Merged
JAVA_X_HOME
#10340