Android m preview 2
Merge "Workaround for breaking change in OpenJDK 8 javadoc"