Remove all stops if using different make/openjdk-java version

Change-Id: I52c2709809a0c8304762fd9be9a320edf313f5fd