Merge "Fix for Java 8 toolchain builds"