all: Pin javac to compile for 1.6.
Merge branch 'master' into stable

* master:
  all: Pin javac to compile for 1.6.