Merge "Extend cargo2android.py version matching to include alpha and beta crates"