am 8700eb60: am 88e1a110: am 680e0370: am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."
am 8700eb60: am 88e1a110: am 680e0370: am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."

* commit '8700eb6049f176045d5a231b944ba27d3eb728ea':
  Unset _JAVA_OPTIONS before running "java -version".

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