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

* commit '680e037007fd0f4207a4734b8fccce17a91ee682':
  Unset _JAVA_OPTIONS before running "java -version".