Merge "egl: plumb through counter events to atrace"