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

Change-Id: I21fed9646eeb8c936584490c252bc020bbe68107