Merge "perfprofd: fix test PerfProfdTest.ConfigFileParsing."
am: f493b45950

Change-Id: I18a39ebac627d0b882c34b8cefdc0bdb9e8c6379