Improve version detection. am: 9a90474af8 am: 5e577a255f am: 8e30f0ce76 am: 7f52a07094
Improve version detection. am: 9a90474af8 am: 5e577a255f am: 8e30f0ce76 am: 7f52a07094

Change-Id: I2846d7e6c4cf3e6cb65bd4bafa2c34afdfe55ee0

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