Merge "Don't hardcode expected path to mainDexClasses"