am 17df905a: merge from open-source master

Merge commit '17df905a9bd26ca34b4fc75e29671fc88c1f7f1b'

* commit '17df905a9bd26ca34b4fc75e29671fc88c1f7f1b':
  Switch the required host Java environment to 1.6.