Merge "Make netvirt use java-builder-4c-16g"