Merge "cargo2android: Improve package version logic"