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

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

Change-Id: I8a1f5533eb0769d4e6ee79a94c8a18715f9f4ba2