Merge "Enable vid docker build jobs to use java-1.8"