am d83f3396: Revert "Merge "Switch the required host Java environment to 1.6." into kraken"

Merge commit 'd83f33969aa2734000338e01b84957996ef1bb34' into gingerbread

* commit 'd83f33969aa2734000338e01b84957996ef1bb34':
  Revert "Merge "Switch the required host Java environment to 1.6." into kraken"