Get Windows Editor buildbot running with correct java again.

client/tools/buildbot_annotated_steps.py

Index: client/tools/buildbot_annotated_steps.py
diff --git a/client/tools/buildbot_annotated_steps.py b/client/tools/buildbot_annotated_steps.py
index 1c88a66cf2dfbafa6da47607ae30dcc2f4fe7986..21f2e48893b8af819fcb87c77f2099dcba39aa38 100755
--- a/client/tools/buildbot_annotated_steps.py
+++ b/client/tools/buildbot_annotated_steps.py
@@ -15,6 +15,7 @@ chromium and headless dartium.
 
 import imp
 import os
+import platform
 import re
 import socket
 import subprocess
@@ -134,7 +135,10 @@ def FixJavaHome():
   buildbot_javahome = os.getenv('BUILDBOT_JAVA_HOME')
   if buildbot_javahome:
     current_pwd = os.getenv('PWD')
-    java_home = '/usr/lib/jvm/java-6-sun'#os.path.join(current_pwd, buildbot_javahome)
+    if platform.system() != 'Windows':
+      java_home = '/usr/lib/jvm/java-6-sun' # Hackety-hack. Please remove!
+    else:
+      java_home = os.path.join(current_pwd, buildbot_javahome)
     java_bin = os.path.join(java_home, 'bin')
     os.environ['JAVA_HOME'] = java_home
     os.environ['PATH'] = '%s;%s' % (java_bin, os.environ['PATH'])