Merge "Add GPU draw stats to gfxinfo and GraphicsStatsService"