Merge "Fix documentation generation with OpenJDK 9 javadoc." am: ed6ae8f2b1
am: 8d4e36b1e8

Change-Id: Iba6de5e888f7de9835199eda278c46f6b3c261d8