Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466

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

Change-Id: Ia16622160843577edee93774ce02462ef4763777