Merge "Revert "Enable compilation of secondary dex files""