Merge "Simplify doclava build.gradle" am: aee2105a3f am: 613c45cab4

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

Change-Id: I524d9bf90366c01910a3a7717e590050dde148fe