Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466 am: 01990004ec am: ed699579df am: 1f677215d8

Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1705585

Change-Id: I0d07b4841f610dfa4b12de9523277f8b9ab27e9f