Merge pull request #7884 from DonLakeFlyer/AndroidVersionCode

Android: Fix versionCode

tools/update_android_version.sh

@@ -9,8 +9,11 @@ VERSIONCODE=$(($(($minor*10000)) + $VERSIONCODE))
 VERSIONCODE=$(($(($patch*1000)) + $VERSIONCODE))
 VERSIONCODE=$(($(($dev)) + $VERSIONCODE))
 
-# Command line specifies either 32 or 64 bit version
-VERSIONCODE=$1$VERSIONCODE
+# The android versionCode is for the entire package. It is the same for the 32 and 64 bit APKs.
+# At one point it was thought the versionCode was specific to APK. Hence the 32/64 bitness was
+# included as a prefix. That was incorrect. But now we are stuck with version codes starting with
+# a prefix of 64.
+VERSIONCODE=64$VERSIONCODE
 
 MANIFEST_FILE=android/AndroidManifest.xml