Merge "Perfprofd: Slightly refactor ConfigReader"
am: 90bc7b838c

Change-Id: I79eefae53a38660978043126095391457431944c