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

Change-Id: Ia9a2e6c510212d61e8ab5358821f5df9894347fd

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