Merge "Enable compilation of secondary dex files"