Do not use regexps to parse simple version strings. am: 44d3900a5d
am: 1d9ec348fa

Change-Id: I5d6c3a420887c5cd4653ac0c8fd9bebdaef1bea8