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

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

Change-Id: I996a417ef163a1124140f3c5e28ff13147b88ae0