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

Change-Id: I7c94e21a3d376d42ef83377b62001eff087b2dd6