Merge "Add versionCode to split manifest; compile."