Merge "Make doclava compatible with both JDK 8 and 11." am: 17bfa62ff6

Change-Id: If968b62a6a4cab8db5e53a851c3528cb5349d9e3