am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."
am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."

* commit '59ff600927033db50ab4ef131ef198c686a5a65b':
  Unset _JAVA_OPTIONS before running "java -version".

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build