[495961] incompatibility between log4j 1.x and 2.x

Bug: 495961
Change-Id: Iae90d66c35e1b95de648fa99a51757f639177088
5 files changed