Ensure that a matching version of JDK is present for the JRE

Since we specify the Java 7 JRE on exec_environ, we should have
the equivalent Java 7 JDK on dev_environ.

Bug: 54444
Change-Id: I308a7a91397915613403e07b15b00f2a0ebd5357
Merge "Ensure that a matching version of JDK is present for the JRE" into production