Change substring handling

For the builds that have Android version numbers like "4.2.22222222222222" or
"4.3.2.1.000000.000000" and the rest of the jokers. This just shortens it to
our preferred short-hand. (4.1 or 2.3...)
Change added "if" to proper elif

Was stopping flow at a  very weird place-- this is the kind of error that has
every chance to make you want to strangle someone. I got lucky it was one
of only a few changes since it last worked.