am ec1c20a7: am 6ad4e499: am 1f29d2c3: Merge "Switch the required host Java environment to 1.6." into kraken

Merge commit 'ec1c20a7077a0afb476f8ca2b290e7a01c002b1d'

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