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

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

Change-Id: I926db5292a9fc348a191b5e6c76884a635e2536c