Merge "dx: Test script fixes for OpenJDK 9"
am: 3e1cdec3e6

Change-Id: I5d523a64a08c425faba545ce9cb5a72916f78868