Merge "Remove log4j jar file" am: eb43f1bcc8 am: e0d8bc5da9 am: 3716040dca

Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1927618

Change-Id: I1c6cd6c69cccd61be886260688401c5cb5ac281f