Merge "Fix build for some javac compilers." into jb-mr1-dev