Merge "Perfprofd: Add filegroup for record proto" am: 8fb4b9ace1
am: 97371cc073

Change-Id: I01ee0a7c1eacd93b5950e034b9eda4980c9a559b