Merge "Dependency injection of AssetProviders into ApkAssets" into sc-dev