contint: fix openjdk packages names

When getting rid of the java {} defines, I forgot to change the package
names as well.

Change-Id: Iad97436d38e7ad8d66704eda91a76cea67f596ae
Merge "contint: fix openjdk packages names" into production