Merge pull request #513 from cpeterso/cpeterso/strings

Rebase MozStumbler PR #509 and update Android build tool versions (@cpeterso)
MozStumbler v0.17.0