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

Change-Id: Ia2af0b95d0cb230c7dd6f80f22d2351f6646351a