Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466 am: 01990004ec Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1705585 Change-Id: I346feb746e72417c3d26b984591929397867516a