Temporary fix of build failing for jdk8-b93