am 710e0265: resolved conflicts for merge of f966bda4 to master
am 710e0265: resolved conflicts for merge of f966bda4 to master

* commit '710e0265bc5f70398e7c070941ae6af34bf5c5d5':
  Fix java version detection when _JAVA_OPTIONS is set.

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