Support version splitter other than dot am: f160266699
am: 2c8e18ece7

Change-Id: Ife06b4782e7c2db22ce259f1f3ce36e78e73ffa3