Merge "Remove unused log4j jars" am: 86751ba164

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

Change-Id: Ifcf71bdfddde331574ce90c405f41b3826686034