Merge "Perfprofd: Add general event config to Config"
am: 74a44d9ec5

Change-Id: I3fe128fec603c258b295013b9a78a980af23e14c