Merge "Use the correct versionCode for Split APKs" into lmp-dev