Merge "libperfmgr: clean up log format" am: 99d37b48bb
am: 547207e707

Change-Id: I0f498894cb47d2d6548b98821866c6522b8290b0