[dev-only/non-production] Fix GCC build am: e1d7638268 am: 4a5732b7c1
[dev-only/non-production] Fix GCC build am: e1d7638268
am: 4a5732b7c1

Change-Id: Icba30b13545e94878565a2e96db939f4eab5f605

google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto