Do not mark the JDK7 installer -without-jdk-installer
Do not mark the JDK7 installer -without-jdk-installer

Instead just mark it as a default installer when there is
no installer with a bundled JDK.

Fixes #2969
To be cherry-picked for #2692.

PiperOrigin-RevId: 155483548

ulfjack/bazel,cushon/bazel,spxtr/bazel,ButterflyNetwork/bazel,ButterflyNetwork/bazel,dslomov/bazel-windows,ButterflyNetwork/bazel,werkt/bazel,davidzchen/bazel,damienmg/bazel,perezd/bazel,bazelbuild/bazel,bazelbuild/bazel,dslomov/bazel-windows,dslomov/bazel,meteorcloudy/bazel,damienmg/bazel,perezd/bazel,dslomov/bazel,meteorcloudy/bazel,ulfjack/bazel,werkt/bazel,aehlig/bazel,aehlig/bazel,snnn/bazel,dropbox/bazel,dslomov/bazel,damienmg/bazel,werkt/bazel,aehlig/bazel,dropbox/bazel,snnn/bazel,dslomov/bazel-windows,variac/bazel,perezd/bazel,variac/bazel,ulfjack/bazel,aehlig/bazel,akira-baruah/bazel,variac/bazel,juhalindfors/bazel-patches,dslomov/bazel-windows,meteorcloudy/bazel,snnn/bazel,twitter-forks/bazel,ulfjack/bazel,cushon/bazel,dropbox/bazel,katre/bazel,twitter-forks/bazel,juhalindfors/bazel-patches,safarmer/bazel,ButterflyNetwork/bazel,snnn/bazel,safarmer/bazel,davidzchen/bazel,bazelbuild/bazel,ButterflyNetwork/bazel,ulfjack/bazel,akira-baruah/bazel,akira-baruah/bazel,davidzchen/bazel,ulfjack/bazel,katre/bazel,dropbox/bazel,dropbox/bazel,davidzchen/bazel,perezd/bazel,spxtr/bazel,aehlig/bazel,twitter-forks/bazel,twitter-forks/bazel,bazelbuild/bazel,perezd/bazel,safarmer/bazel,akira-baruah/bazel,aehlig/bazel,meteorcloudy/bazel,damienmg/bazel,cushon/bazel,dslomov/bazel,meteorcloudy/bazel,cushon/bazel,twitter-forks/bazel,damienmg/bazel,spxtr/bazel,juhalindfors/bazel-patches,damienmg/bazel,spxtr/bazel,perezd/bazel,juhalindfors/bazel-patches,ButterflyNetwork/bazel,twitter-forks/bazel,twitter-forks/bazel,werkt/bazel,spxtr/bazel,katre/bazel,juhalindfors/bazel-patches,katre/bazel,bazelbuild/bazel,variac/bazel,meteorcloudy/bazel,akira-baruah/bazel,aehlig/bazel,katre/bazel,dslomov/bazel-windows,meteorcloudy/bazel,bazelbuild/bazel,juhalindfors/bazel-patches,snnn/bazel,ulfjack/bazel,spxtr/bazel,dslomov/bazel,variac/bazel,snnn/bazel,damienmg/bazel,dropbox/bazel,akira-baruah/bazel,variac/bazel,safarmer/bazel,dslomov/bazel,cushon/bazel,variac/bazel,spxtr/bazel,davidzchen/bazel,katre/bazel,safarmer/bazel,dslomov/bazel-windows,cushon/bazel,werkt/bazel,snnn/bazel,davidzchen/bazel,perezd/bazel,werkt/bazel,davidzchen/bazel,dslomov/bazel,safarmer/bazel,juhalindfors/bazel-patches