Merge "Perfprofd: Refactor and extend config proto"
am: 06bd30b5fd

Change-Id: I9b148592e6390a922f0813e99a27c8ae7bd100c2