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

Change-Id: If5211902d5ef294ece50d30168f73ded1acbb9b0