CB-7980: Add 9 to versionCode for minSdk 20+ if not multiarch