Merge "Generate compile-time Q-compatible StatsLog" am: d8a5039db0 am: f4eb2201ae

Change-Id: Ibf005775457508d659fa4a0988e9a34d863b2871