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

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

Change-Id: Ida756a174ac7dd2fb05feccb877c8687f7d05b39