Merge "Perfprofd: Refactor ConfigReader"
am: 763bfc6188

Change-Id: If91f7112be47874ebd314a9b8ca33e671873ef7f