build: Allow building with OpenJDK

Change-Id: I6348bc1187240729f75f50d7ef91802c68e7788b
build:  fix merge derp

Change-Id: Ibe1b9da0a51ed593fe8d564ad33d5edae8c38ecd