am 61cf1df7: am 60ef9d5b: Merge "jdk error message should not mention the version"
am 61cf1df7: am 60ef9d5b: Merge "jdk error message should not mention the version"

* commit '61cf1df7edbb9d52a6f151b011633b2859213c35':
  jdk error message should not mention the version

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