Revert "Fix some unittests." am: 7ec25ee794 am: 5de6fb6120 am: 6e4b40b97f am: 4bb1434676
Revert "Fix some unittests." am: 7ec25ee794 am: 5de6fb6120 am: 6e4b40b97f am: 4bb1434676

Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/1818117

Change-Id: I151869e9ef521e18b10ad40335f1e4bee8d676d6

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