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

Change-Id: Ia9206d097b5a5793d35b0e12ec307d013cbe5318