Merge "Add multi-dex to SettingsLibTests when buliding with coverage"