Merge "Remove unused log4j jars" am: 86751ba164 am: 9a22e3767c

Original change: https://android-review.googlesource.com/c/platform/prebuilts/tools/+/1920048

Change-Id: I5aa4b610b39bb9b4535a73dfeecff1aa3f13272b