Fix GCC build am: 2af0033492 am: 31df5b0760 am: 7c9e61ea8c
Fix GCC build am: 2af0033492 am: 31df5b0760
am: 7c9e61ea8c

Change-Id: Idd7e1b79618e1cf9d8bef89db502c8dc237f394e

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