Merge "Dalvik: Fix mainDexClasses"