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

Change-Id: Ibe8deab1cdf577545ddfaf5f234b61c671e4003a