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

Change-Id: I254d54eedcc157bb116644e1a1ea9ea17b156dc2

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