Merge "Add explicit versionCode to DexMetadataHelperTest APKs" into sc-dev