Merge "dx: Test script fixes for OpenJDK 9"