Merge "Loganalysis: convert to soong (1/2)" am: 7c4aeb12ee
am: f7187e0d2e

Change-Id: I9487f7d6d9d85416ce8315734df461c4cfff3025