Merge "Moving the JAVA_BINARY variable to be initialized properly"