Merge pull request #12823 from JosJuice/android-new-version-code Android: Adopt a new versionCode scheme
