Fix GCC build (again) am: 5252660bfe
Fix GCC build (again)
am: 5252660bfe

Change-Id: I0ce20713e6503411cdb5f3ab584f23bdfb7362e0

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