Fix bugs in CPU Reader. am: cb45aa9be2
Fix bugs in CPU Reader.
am: cb45aa9be2

Change-Id: Iac936bf05cae164c92ab39403bce5d76a7d6f535

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